From 70446f9e45c37a1b18126769f135c173a2b54e55 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 2 Sep 2014 10:30:20 -0700 Subject: [PATCH] Don't use bundled fonts --- src/doc/mkfonts.rb | 35 --------------------- src/doc/source/stylesheets/all.css.scss | 8 +++-- src/doc/source/stylesheets/fonts.css.scss | 38 ----------------------- src/doc/woffify.rb | 9 ------ 4 files changed, 5 insertions(+), 85 deletions(-) delete mode 100644 src/doc/mkfonts.rb delete mode 100644 src/doc/woffify.rb diff --git a/src/doc/mkfonts.rb b/src/doc/mkfonts.rb deleted file mode 100644 index deb5ce437..000000000 --- a/src/doc/mkfonts.rb +++ /dev/null @@ -1,35 +0,0 @@ -require "erb" - -def font(url, family, weight: weight, italic: italic) - url = "../fonts/#{url}.woff" - - erb = ERB.new(<<-HERE.gsub(/^ /, ""), nil, "-") - @font-face { - src: url("#{url}"); - font-family: "<%= family %>"; - <%- if weight -%> - font-weight: <%= weight %>; - <%- end -%> - <%- if italic -%> - font-style: italic; - <%- end -%> - } - - HERE - - erb.result(binding) -end - -File.open("source/stylesheets/fonts.css.scss", "w") do |file| - file.puts font("Consolas", "Consolas") - file.puts font("Consolas-Bold", "Consolas", weight: "bold") - file.puts font("Consolas-Italic", "Consolas", italic: true) - file.puts font("Consolas-Bold-Italic", "Consolas", weight: "bold", italic: true) - - file.puts font("Roboto/Roboto-Thin", "Roboto", weight: 100) - file.puts font("Roboto/Roboto-Light", "Roboto", weight: 200) - file.puts font("Roboto/Roboto-Regular", "Roboto", weight: 400) - file.puts font("Roboto/Roboto-Medium", "Roboto", weight: 500) - file.puts font("Roboto/Roboto-Bold", "Roboto", weight: 700) - file.puts font("Roboto/Roboto-Black", "Roboto", weight: 800) -end diff --git a/src/doc/source/stylesheets/all.css.scss b/src/doc/source/stylesheets/all.css.scss index bee95862e..6e8b9fdd4 100644 --- a/src/doc/source/stylesheets/all.css.scss +++ b/src/doc/source/stylesheets/all.css.scss @@ -11,11 +11,12 @@ html { } pre { - font-family: "Consolas"; + font-family: monospace; + font-size: 110%; } body { - font-family: "Roboto"; + font-family: sans-serif; } * { @@ -70,7 +71,8 @@ h2 { } code:not(.highlight) { - font-family: Consolas; + font-family: monospace; + font-size: 110%; color: $purple; } diff --git a/src/doc/source/stylesheets/fonts.css.scss b/src/doc/source/stylesheets/fonts.css.scss index d65b3d2ce..09709a454 100644 --- a/src/doc/source/stylesheets/fonts.css.scss +++ b/src/doc/source/stylesheets/fonts.css.scss @@ -1,39 +1 @@ @import "compass/css3"; - -@include font-face("Consolas", inline-font-files("Consolas.woff", woff), $weight: 400); -@include font-face("Consolas", inline-font-files("Consolas-Bold.woff", woff), $weight: 700); -@include font-face("Roboto", inline-font-files("Roboto/Roboto-Regular.woff", woff), $weight: 400); -@include font-face("Roboto", inline-font-files("Roboto/Roboto-Bold.woff", woff), $weight: 700); -@include font-face("Roboto", inline-font-files("Roboto/Roboto-Medium.woff", woff), $weight: 500); - -@font-face { - src: url("../fonts/Consolas-Italic.woff"); - font-family: "Consolas"; - font-style: italic; -} - -@font-face { - src: url("../fonts/Consolas-Bold-Italic.woff"); - font-family: "Consolas"; - font-weight: bold; - font-style: italic; -} - -@font-face { - src: url("../fonts/Roboto/Roboto-Thin.woff"); - font-family: "Roboto"; - font-weight: 100; -} - -@font-face { - src: url("../fonts/Roboto/Roboto-Light.woff"); - font-family: "Roboto"; - font-weight: 200; -} - -@font-face { - src: url("../fonts/Roboto/Roboto-Black.woff"); - font-family: "Roboto"; - font-weight: 800; -} - diff --git a/src/doc/woffify.rb b/src/doc/woffify.rb deleted file mode 100644 index 33c90769a..000000000 --- a/src/doc/woffify.rb +++ /dev/null @@ -1,9 +0,0 @@ -require "fileutils" - -FileUtils.rm Dir["source/fonts/**/*.woff"] - -Dir["source/fonts/**/*.ttf"].each do |file| - out = file.sub(/\.ttf$/, ".woff").gsub(' ', "-") - puts "Converting `#{file}` to `#{out}`" - `~/npm/bin/ttf2woff "#{file}" "#{out}"` -end -- 2.30.2